Rename uuid_generate to avoid conflich with one in darwin's libm.

diff --git a/gpsbabel/coastexp.c b/gpsbabel/coastexp.c
index 4f2d35af5564b1209782749575b60c28c1de9fb9..d44b20f11d911a8f9ead32631777d877e50e71f5 100755 (executable)
--- a/gpsbabel/coastexp.c
+++ b/gpsbabel/coastexp.c
@@ -514,7 +514,7 @@ static char *
 ce_gen_uuid(void)
 {
        uuid_t uu;
-       uuid_generate(uu);
+       gb_uuid_generate(uu);
        sprintf(uuid_buffer, "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
                uu[0], uu[1], uu[2], uu[3], uu[4], uu[5], uu[6], uu[7],
                uu[8], uu[9], uu[10], uu[11], uu[12], uu[13], uu[14], uu[15]);

diff --git a/gpsbabel/uuid.c b/gpsbabel/uuid.c
index f7e568ca38712e4f50dff42f3f90e9d30e038940..cba1d65ff78f52323b871425ade4504a6d3170b5 100755 (executable)
--- a/gpsbabel/uuid.c
+++ b/gpsbabel/uuid.c
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 
 void
-uuid_generate(uuid_t uu)
+gb_uuid_generate(uuid_t uu)
 {
        unsigned char *cp;
        int i;

diff --git a/gpsbabel/uuid.h b/gpsbabel/uuid.h
index fb8dc02fc88d7dfeb5b6df619f3df9a034a48f32..161b89e91ecab1187d477c548fcf1afef7df8ba6 100755 (executable)
--- a/gpsbabel/uuid.h
+++ b/gpsbabel/uuid.h
@@ -19,4 +19,4 @@
 
 typedef unsigned char uuid_t[16];
 
-void uuid_generate(uuid_t uu);
+void gb_uuid_generate(uuid_t uu);